From: Dirkjan Ochtman <dirkjan@ochtman.nl>
Date: Sat, 28 Apr 2018 12:50:56 +0000 (+0200)
Subject: Pass target configs directly to BuildState::new()
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~22^2~1^2~10^2~7
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success//%22http:/www.example.com/cgi/success/?a=commitdiff_plain;h=34b59b1f57cd0c749e82373207f33ea14ae74342;p=cargo.git

Pass target configs directly to BuildState::new()
---

diff --git a/src/cargo/core/compiler/context/mod.rs b/src/cargo/core/compiler/context/mod.rs
index 02b6f1111..c106a0468 100644
--- a/src/cargo/core/compiler/context/mod.rs
+++ b/src/cargo/core/compiler/context/mod.rs
@@ -100,7 +100,10 @@ impl<'a, 'cfg> Context<'a, 'cfg> {
         Ok(Self {
             bcx,
             compilation,
-            build_state: Arc::new(BuildState::new(&bcx.build_config)),
+            build_state: Arc::new(BuildState::new(
+                &bcx.build_config.host,
+                &bcx.build_config.target,
+            )),
             fingerprints: HashMap::new(),
             compiled: HashSet::new(),
             build_scripts: HashMap::new(),
diff --git a/src/cargo/core/compiler/custom_build.rs b/src/cargo/core/compiler/custom_build.rs
index 78dfe759b..1aba821d2 100644
--- a/src/cargo/core/compiler/custom_build.rs
+++ b/src/cargo/core/compiler/custom_build.rs
@@ -12,7 +12,7 @@ use util::{self, internal, paths, profile};
 use util::{Cfg, Freshness};
 
 use super::job::Work;
-use super::{fingerprint, Context, Kind, Unit};
+use super::{fingerprint, Context, Kind, TargetConfig, Unit};
 
 /// Contains the parsed output of a custom build script.
 #[derive(Clone, Debug, Hash)]
@@ -364,10 +364,10 @@ fn build_work<'a, 'cfg>(cx: &mut Context<'a, 'cfg>, unit: &Unit<'a>) -> CargoRes
 }
 
 impl BuildState {
-    pub fn new(config: &super::BuildConfig) -> BuildState {
+    pub fn new(host_config: &TargetConfig, target_config: &TargetConfig) -> BuildState {
         let mut overrides = HashMap::new();
-        let i1 = config.host.overrides.iter().map(|p| (p, Kind::Host));
-        let i2 = config.target.overrides.iter().map(|p| (p, Kind::Target));
+        let i1 = host_config.overrides.iter().map(|p| (p, Kind::Host));
+        let i2 = target_config.overrides.iter().map(|p| (p, Kind::Target));
         for ((name, output), kind) in i1.chain(i2) {
             overrides.insert((name.clone(), kind), output.clone());
         }